34 
+    lens_hood_status = models.BooleanField(_(u'lens_hood_status'), default=True, help_text=u'遮光罩状态')
35 
+    tripod_ring_status = models.BooleanField(_(u'tripod_ring_status'), default=True, help_text=u'脚架环状态')
36 
+    appearance_performance_status = models.BooleanField(_(u'appearance_performance_status'), default=True, help_text=u'外观性能状态')
31 37 
     tenancy_status = models.IntegerField(_(u'tenancy_status'), choices=TENANCY_STATUS, default=0, help_text=u'租借状态')
32 38
33 39 
     class Meta:
@@ -41,10 +47,15 @@ class TenancyShotInfo(BaseModelMixin):
41 47 
     def data(self):
42 48 
         return {
43 49 
             'shot_id': self.shot_id,
50 
+            'model_id': self.model_id,
44 51 
             'model_name': self.model_name,
45 52 
             'sn': self.sn,
46 
-            'fittings_type': self.fittings_type,
47 
-            'fittings_type_str': dict(TenancyShotInfo.FITTINGS_TYPE).get(self.fittings_type),
53 
+            # 'fittings_type': self.fittings_type,
54 
+            'front_cap_status': self.front_cap_status,
55 
+            'rear_cap_status': self.rear_cap_status,
56 
+            'lens_hood_status': self.lens_hood_status,
57 
+            'tripod_ring_status': self.tripod_ring_status,
58 
+            'appearance_performance_status': self.appearance_performance_status,
48 59 
             'tenancy_status': self.tenancy_status,
49 60 
             'tenancy_status_str': dict(TenancyShotInfo.TENANCY_STATUS).get(self.tenancy_status),
50 61 
             'created_at': tc.local_string(utc_dt=self.created_at),

:art: Opt user select_for_update() · 2bf12ea156 - Gogs: Go Git Service
Home Explore Help
Register Sign In
Kodo
/
kodo
Watch 2
Star 0
Fork 0

Browse Source
:art: Opt user select_for_update()

huangqimin001 6 years ago
parent
6001a58bda
commit
2bf12ea156
4 changed files with 4 additions and 3 deletions
Show Diff Stats
  1. 1 1
      api/admin_views.py
  2. 1 1
      commands/management/commands/gis.py
  3. 1 0
      miniapp/qy_views.py
  4. 1 1
      miniapp/views.py

+ 1 - 1
api/admin_views.py
View File 

@@ -273,7 +273,7 @@ def userinfo_update(request):
273 273
274 274 
     # 校验用户是否存在
275 275 
     try:
276 
-        user = UserInfo.objects.get(user_id=user_id, status=True)
276 
+        user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
277 277 
     except UserInfo.DoesNotExist:
278 278 
         return response(UserStatusCode.USER_NOT_FOUND)
279 279

+ 1 - 1
commands/management/commands/gis.py
View File 

@@ -57,7 +57,7 @@ class Command(CompatibilityBaseCommand):
57 57 
                     ymd = str(v.get('ymd', ''))
58 58
59 59 
                     # 更新用户表
60 
-                    user = UserInfo.objects.get(user_id=user_id, status=True)
60 
+                    user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
61 61 
                     user.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
62 62 
                     user.save()
63 63

+ 1 - 0
miniapp/qy_views.py
View File 

@@ -118,6 +118,7 @@ def qy_login_api(request):
118 118
119 119 
     return response(200, 'Mini App Login Success', u'微信小程序登录成功', user.brand_qydata(brand_id=brand_id))
120 120
121 
+
121 122 
 @logit(res=True)
122 123 
 @transaction.atomic
123 124 
 def query_userinfo(request):

+ 1 - 1
miniapp/views.py
View File 

@@ -197,7 +197,7 @@ def get_userinfo_api2(request):
197 197 
     iv = request.POST.get('iv', '')
198 198
199 199 
     try:
200 
-        user = UserInfo.objects.get(user_id=user_id, status=True)
200 
+        user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
201 201 
     except UserInfo.DoesNotExist:
202 202 
         return response(UserStatusCode.USER_NOT_FOUND)
203 203